Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added virus scan to uploads spec #16393

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Added virus scan to uploads spec #16393

merged 2 commits into from
Apr 17, 2024

Conversation

RachalCassity
Copy link
Member

Fixing future merge conflicts

@RachalCassity RachalCassity requested review from a team as code owners April 17, 2024 20:38
rmtolmach
rmtolmach previously approved these changes Apr 17, 2024
Copy link
Contributor

@rmtolmach rmtolmach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RachalCassity RachalCassity merged commit 1e28915 into master Apr 17, 2024
20 checks passed
@RachalCassity RachalCassity deleted the fixing-master-merge branch April 17, 2024 21:17
stevenjcumming pushed a commit that referenced this pull request Apr 19, 2024
* Added virus scan to uploads spec

* Fixing Virus scan spec
stevenjcumming added a commit that referenced this pull request Apr 29, 2024
* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* add clamav host & port to settings

* add restart services to docker-compose review

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* update dockerfile ruby version

---------

Co-authored-by: Rachal Cassity <[email protected]>
stevenjcumming added a commit that referenced this pull request Apr 29, 2024
* ClamAV in Containers (#15965)

* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* add clamav host & port to settings

* add restart services to docker-compose review

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* update dockerfile ruby version

---------

Co-authored-by: Rachal Cassity <[email protected]>

* delete code checks yml

---------

Co-authored-by: Rachal Cassity <[email protected]>
RachalCassity added a commit that referenced this pull request Apr 30, 2024
* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* add clamav host & port to settings

* add restart services to docker-compose review

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* update dockerfile ruby version

* add working directory to test docker-compose

* update volumes in docker test

* update shared volume in review docker compose

* revert review docker compose changes

* update srv/vets-api/* dir to app/*

* update clamav to use sockets

* remove working_dir from docker-compose test

---------

Co-authored-by: Rachal Cassity <[email protected]>
@ericboehs ericboehs mentioned this pull request Apr 30, 2024
9 tasks
stevenjcumming added a commit that referenced this pull request Apr 30, 2024
* ClamAV in Containers (attempt 2) (#16561)

* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* add clamav host & port to settings

* add restart services to docker-compose review

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* update dockerfile ruby version

* add working directory to test docker-compose

* update volumes in docker test

* update shared volume in review docker compose

* revert review docker compose changes

* update srv/vets-api/* dir to app/*

* update clamav to use sockets

* remove working_dir from docker-compose test

---------

Co-authored-by: Rachal Cassity <[email protected]>

* next instead of break (#16575)

* remove codechecks from k8s

---------

Co-authored-by: Rachal Cassity <[email protected]>
Co-authored-by: Seth Darr <[email protected]>
stevenjcumming added a commit that referenced this pull request May 8, 2024
* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* update hybrid docs

* add clamav host & port to settings

* add restart services to docker-compose review

* update hybrid and native docs for clamav

* remove clamav setup for ubuntu

* add clamav configration info for docker setup

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* fix merge conflict

* add rvm install ruby version troubleshooting tip

* update dockerfile ruby version

* resolve merge conflict

* rephrase heading

* update clamav daemon socket docs and comment socket env var

* correct phrasing

* update from GH comments

---------

Co-authored-by: Rachal Cassity <[email protected]>
RachalCassity added a commit that referenced this pull request May 8, 2024
* Update Docs for ClamAV in Container  (#16058)

* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* update hybrid docs

* add clamav host & port to settings

* add restart services to docker-compose review

* update hybrid and native docs for clamav

* remove clamav setup for ubuntu

* add clamav configration info for docker setup

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* fix merge conflict

* add rvm install ruby version troubleshooting tip

* update dockerfile ruby version

* resolve merge conflict

* rephrase heading

* update clamav daemon socket docs and comment socket env var

* correct phrasing

* update from GH comments

---------

Co-authored-by: Rachal Cassity <[email protected]>

* fixing k8s

---------

Co-authored-by: stevenjcumming <[email protected]>
RachalCassity added a commit that referenced this pull request May 8, 2024
* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* update hybrid docs

* add clamav host & port to settings

* add restart services to docker-compose review

* update hybrid and native docs for clamav

* remove clamav setup for ubuntu

* add clamav configration info for docker setup

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* fix merge conflict

* add rvm install ruby version troubleshooting tip

* update dockerfile ruby version

* resolve merge conflict

* rephrase heading

* update clamav daemon socket docs and comment socket env var

* correct phrasing

* update from GH comments

---------

Co-authored-by: stevenjcumming <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants